Skip to content

Resync 0.10 into master, fixing merge conflicts #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 47 commits into from
Jan 26, 2016
Merged

Resync 0.10 into master, fixing merge conflicts #1019

merged 47 commits into from
Jan 26, 2016

Conversation

@peternewman
Copy link
Member

@peternewman peternewman commented Jan 26, 2016

No description provided.

peternewman and others added 30 commits January 10, 2016 23:07
@peternewman
Check if the device exists before bothering to try to acquire a lock …
980ea41 
…file
@nomis52
Merge pull request OpenLightingProject#1010 from peternewman/debian
6c1cca3 
Check if the device exists before bothering to try to acquire a lock file
@peternewman
Update NEWS
e5b4e15
@peternewman
Merge branch '0.10' into debian
3516757
@peternewman
Start fixing flake8 issues(cherry picked from commit b5c881e)
fa3c854
@peternewman
Skip "E114 indentation is not a multiple of four (comment)"
6caed96
@peternewman
Start fixing flake8 issues(cherry picked from commit f839779)
61cdc6f
@peternewman
Start fixing flake8 issues(cherry picked from commit 28a87a8)
18c8ecf
@peternewman
Start fixing flake8 issues(cherry picked from commit 88cf0d4)
ace2d21
@peternewman
Start fixing flake8 issues(cherry picked from commit d3daa43)
6b7b0b0
@peternewman
Start fixing flake8 issues(cherry picked from commit 1991ba6)
f41ce42
@peternewman
Start fixing flake8 issues(cherry picked from commit a3f3bf9)
ef97e6f
@peternewman
Start fixing flake8 issues(cherry picked from commit 5705234)
17383ba
@peternewman
Start fixing flake8 issues(cherry picked from commit f66651a)
015995d
@peternewman
Fixing more new flake8 issues(cherry picked from commit de5b3e3)
0e9c64a
@peternewman
Fixing more new flake8 issues(cherry picked from commit 102f60f)
32e4d9e
@peternewman
Fixing more new flake8 issues(cherry picked from commit 1565244)
1da80a1
@peternewman
Fixing more new flake8 issues(cherry picked from commit 1a23039)
b170766
@peternewman
Fixing more new flake8 issues(cherry picked from commit d02fe41)
ae2dc9b
@peternewman
Fixing more new flake8 issues(cherry picked from commit e46a3b6)
1c20ad5
@peternewman
Fixing more new flake8 issues(cherry picked from commit 3f51410)
d39f28c
@peternewman
Fixing more new flake8 issues(cherry picked from commit 9368efb)
3016211
@peternewman
Fixing more new flake8 issues(cherry picked from commit efe3324)
ee1f006
@peternewman
Fixing more new flake8 issues(cherry picked from commit c61972c)
afc90fd
@peternewman
Update StreamRpcChannel.py(cherry picked from commit 2798436)
425c6f5
@peternewman
Fixing more new flake8 issues(cherry picked from commit ca4df53)
c8623ab
@peternewman
Fixing more new flake8 issues(cherry picked from commit ab8f301)
766f118
@peternewman
Fixing more new flake8 issues(cherry picked from commit 73882dd)
6fc06d6
@peternewman
Fixing more new flake8 issues(cherry picked from commit 66e577c)
09b2aae
@peternewman
Fixing more new flake8 issues(cherry picked from commit 64a7932)
1c52b0b
peternewman and others added 17 commits January 24, 2016 19:42
@peternewman
Fixing more new flake8 issues(cherry picked from commit 161eab9)
2318c7c
@peternewman
Fixing more new flake8 issues(cherry picked from commit cd0e190)
6bf0aa7
@peternewman
Fixing more new flake8 issues(cherry picked from commit a4c2d14)
7587659
@peternewman
Fixing more new flake8 issues(cherry picked from commit 5f72eff)
01a76ba
@peternewman
Try and fix the line break before a binary operator error(cherry pick…
5730358 
…ed from commit b1a2c5c)
@peternewman
Fix the whitespace error(cherry picked from commit 7a343f2)
e3311cc
@peternewman
Try and fix the line break before a binary operator error(cherry pick…
e333b30 
…ed from commit f228355)
@peternewman
Fix the outstanding lambda issues
57e40cb 
(cherry picked from commit 3f960c9)
@peternewman
Fix trailing whitespace(cherry picked from commit 472857a)
1b8ba6b
@peternewman
Fix trailing whitespace(cherry picked from commit e0e016c)
1aab307
@peternewman
Fix up the file
1c1d6a0
@peternewman
Fix up the file
68efa5a
@peternewman
Allow more code to be imported(cherry picked from commit 20f76b5)
af571df
@peternewman
Allow more code to be imported(cherry picked from commit c859d50)
7596eb2
@peternewman
Fix more pychecker issues
69463b0 
(cherry picked from commit 9a92c23)
@peternewman
Merge pull request OpenLightingProject#1016 from peternewman/debian
542a070 
Update NEWS
@peternewman
Merge branch '0.10' of https://github.com/OpenLightingProject/ola int…
de3fa35 
…o pychecker

Conflicts:
	.travis-ci.sh
	python/examples/ola_artnet_params.py
	python/examples/ola_candidate_ports.py
	python/examples/ola_devices.py
@peternewman peternewman added this to the 0.11.0 milestone Jan 26, 2016
@peternewman peternewman mentioned this pull request Jan 26, 2016
Merged
nomis52 added a commit that referenced this pull request Jan 26, 2016
@nomis52
Merge pull request #1019 from peternewman/pychecker
c5af512 
Resync 0.10 into master, fixing merge conflicts
@nomis52 nomis52 merged commit c5af512 into OpenLightingProject:master Jan 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@nomis52 nomis52

Labels

None yet

Projects

None yet

Milestone

0.11.0

Development

Successfully merging this pull request may close these issues.

2 participants

@peternewman @nomis52